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

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

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