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: If4cc85d8f23d1a88866b7ce2eb0ad4358799bc84