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

am skip reason: Change-Id I2efd8b65312e25c5c96bf36b3c4a655baffe2eaa with SHA-1 ecb18a65 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib590035a7b3f124b2a767279623d51bc8c0dbd18