[automerger skipped] Merge "Grant shell missing permissions" am: 51e5e80876 am: e2919bf071 am: 7a37d828de -s ours
am skip reason: skip tag Change-Id I11df0d753f830b6ba6ea2222f7d8a7d778161953 with SHA-1 b173952e19 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670006
Change-Id: I03824d640688b3eb4fb24cb3f1b933072a8dd73d
This commit is contained in: