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: I5c0dfbb853c903784ea262f91179ac9eaf7b7bcc