[automerger skipped] Merge "Merge Android R" am: 75abb09a -s ours am:...

[automerger skipped] Merge "Merge Android R" am: 75abb09a -s ours am: 284bd39f -s ours am: 2cb1e6bc -s ours am: 8dec5b35 -s ours am: c3b1cd42 -s ours

am skip reason: Change-Id I2e4012ae6bf1cf4e5e5cb76790cd2451e313febc with SHA-1 05bfabfc is in history

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

Change-Id: I03e1b4764b9921a540c8da4a6d042a1f12e19863