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