Merge changes from topic "am-c672d39f5f4e41c4baf825907441f036" into sc-v2-dev-plus-aosp am: 4573282113

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

Change-Id: I0c11f1cc4aa0aee2865feac1efce2285831a392f