Merge "(TouchMode Permission) Update shell permission" am: 9d625f5392 am: 74927c2995

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

Change-Id: I8d44811b771bb7ddc2c3e61b5d7567ef064869e7