Merge changes from topic...

Merge changes from topic "revert-20479526-revert-20427045-258023561-BPDASTWITO-FBDWZBDEFC" into tm-qpr-dev am: 691c6e51

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



Change-Id: I186279c0d3a7c8c3a92d83984c298e4687aae60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>