Merge changes from topic "revert-14664190-JGHJCCJYPM" into sc-dev am: 67914aff50 am: 8d996187ea am: 00a0efca95

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

Change-Id: I05b89930d87f76c66db03eb47dda1008a659da64