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

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

Change-Id: I3e3075eea443242d67ce9f05156b379772e467fe