[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 05bfabfc -s ours am: e6948800 -s ours am: 83a9c614 -s ours am: 62d3363d -s ours

am skip reason: Change-Id I88f54d5cf388aeacbf1da48e3e5f1e89f37ba836 with SHA-1 e8e68000 is in history

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

Change-Id: I83caf25e37a597ff175e6a9a942ad3902d0d6a1d