[automerger skipped] DO NOT MERGE - Merge RP1A.201005.006 am: 05a4c9e19a am: 603572dd6c am: 6b3d5d51b6 am: 1d05532628 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iafff39d1168805172d83401feaa4e6f43d9209d2