Merge changes from topic "revert-17607211-aosp_tablet_tune-LBHOYHXCMR" into tm-mainline-prod am: d5d551f094

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

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