[automerger skipped] Merge "Grant shell missing permissions" am: 51e5e808...

[automerger skipped] Merge "Grant shell missing permissions" am: 51e5e808 am: e2919bf0 am: 7a37d828 -s ours am: 0dcb36f9 -s ours

am skip reason: skip tag Change-Id I11df0d753f830b6ba6ea2222f7d8a7d778161953 with SHA-1 b173952e is already in history

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

Change-Id: I0225bb2bfbaa74c6f2b7a2d99bb39e719f3153db