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

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

Change-Id: I6a72e4492f5078aab2442ee0f5722a49f95cf76b