Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 5d12fe84c7 -s ours

am skip reason: Merged-In I61ad93cf5e8d8e25cf856c807027769f209c371a with SHA-1 43e258e0ce is already in history

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

Change-Id: I0048892dffb106de28f5a002a5e9050e85e0b619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>