[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-afa98d56a10a42f4b953a23b9b07db3b" into sc-v2-dev-plus-aosp am: ce048f07 -s ours

am skip reason: Merged-In Iaec77d15c9533edccd9c82164143af8fa522158f with SHA-1 b030f83f is already in history

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

Change-Id: I61adc056b7ebcee2cd049bffa7ecc20eb7e60b56