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

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

Change-Id: I97452f64d140acfa428639390311c3d24a1c6ea0