Merge mainline-release 6664920 to master - DO NOT MERGE am: 3e61e285ba

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

Change-Id: I18706b4dabb87086c23bceb7df68705919471526