Merge changes from topic "am-e105c9a980354a1590d80fe0d5a3450d" into...

Merge changes from topic "am-e105c9a980354a1590d80fe0d5a3450d" into tm-qpr-dev-plus-aosp am: 9615d1fa -s ours

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

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



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