DO NOT MERGE - Merge RP1A.201005.006 am: 05a4c9e19a am: 603572dd6c

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

Change-Id: I2eec0c9e683a4c6c33c4a6cc69cd8e7e4a391e6c