Merge "DO NOT MERGE" into sc-dev am: 77afcf32f3

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

Change-Id: I85ea0c10c02086fcf539e0bf7255c060c378fa63