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

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

Change-Id: Id46f1ff2654e4311c0ddd2c56e3016fedc982c51