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

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

Change-Id: I9d647d893cb955091ecef0b4c289597a0dc39632