DO NOT MERGE am: 1fb6718c85

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

Change-Id: I6205b60242fbc2b5b3ed2051a5728ac8b7dc7c71