[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 053a3415 -s ours am: 49665ae5 -s ours am: dc0b2125 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I67d4293ee3e14dcc1dbdd059e777243a7774c7e6