[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 3c4b9d52 am: aef9c20a am: dbae408d am: 295eca1f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I91d1ff774ca85e75bb04eb2d5da0f63bed25cd09