Merge "Revert "Introducing new variable to enable/disable shortcuts."" into...

Merge "Revert "Introducing new variable to enable/disable shortcuts."" into tm-qpr-dev am: 698239e1 am: 1b3a9650

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



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