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

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

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

Change-Id: If41856764970db256c8768944512d3f0ca47e1e2