[automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6557059 am:...

[automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6557059 am: fa6e021c am: 0b5bf821 am: d7e97e2f am: bc6b99f5 -s ours

am skip reason: Change-Id I280025d9e58626fe725fe24ca60c28e89d0cee74 with SHA-1 f903d2c9 is in history

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

Change-Id: I61c93eabf30b28f3bd80aebfe8476e856d8af2ff