[automerger skipped] Merge "Adding some permissions to Shell to enable testing" am: 502baa4117 am: 0272cc7dd7 am: c9b05d56ec -s ours

am skip reason: skip tag Change-Id I60e745c4ff32cbf8f8ff8b5d016555a25a065f39 with SHA-1 00967754c3 is already in history

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

Change-Id: Ic088e14fe00de9e68b703640aded8985e8b19bb1