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

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

Change-Id: I0fe784c14863ff69c8375883331a04937cb2f6d4