Merge "Merge "Remove ability for user to open wallet directly within shortcuts...

Merge "Merge "Remove ability for user to open wallet directly within shortcuts disabled dialog" into udc-dev am: ed2f66c6 am: 37afcf78 am: f2f25c35" into udc-qpr-dev-plus-aosp am: 022e7749

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



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