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

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

Change-Id: Ibeb279183863d166ba52922437e0a7b73d5bb124