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

[automerger skipped] Merging from ub-launcher3-rvc-dev @ build 6552182 am: e557bac0 am: a203a721 -s ours am: 2fb63ca8 -s ours am: afd6a98f -s ours

am skip reason: Change-Id I795aafd151c6ce53077e1aebb97567eedd84f274 with SHA-1 e557bac0 is in history

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

Change-Id: I9bacf508ca71fd31c16e7475ae9600d36b98b23e