Merge "DO NOT MERGE - Merge RP1A.201005.006" am: 3c4b9d5283 am: aef9c20ae0

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

Change-Id: Id97b52d6540954ebd798687af9f595b544206601