[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: 5d12fe84 -s ours am: 6c711f8b -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: I088c636454aa3e86762fcf66bf557c298d7f2173
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>