Merge "Introducing new variable to enable/disable shortcuts." into tm-qpr-dev am: 2e106277d7 am: 70096cc480

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

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