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

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

Change-Id: Ib9ac028268405f984a10ad0a4e8fe646fe4a88ed