Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev am:...

Merge "Add FLAG_ACTIVITY_SINGLE_TOP to shortcuts intent" into tm-qpr-dev am: ce2405e9 am: de09f078

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



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