Merge "Overlay property instead of style" into sc-dev am: 85df1c291f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13666592

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19e3daadc9f46f53170c0d2a7221c22af2f2b41e