DO NOT MERGE am: 1fb6718c85

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

Change-Id: I0979cda3bf21947188a3301b7c73442d0c9c8e60