Merge changes from topic "androidx_drop-sc-dev-plus-aosp" into sc-dev-plus-aosp am: af52aea9a3 am: 9b17656ba1

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

Change-Id: I52e46ed8fcc9a47ad97da077ada959a719055ba4