Merge "Remove ability for user to open wallet directly within shortcuts disabled dialog" into udc-dev am: ed2f66c6 am: fbe7fd39 am: 4274b52c am: ea148d15

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23450518



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