Merge "Grant shell missing permissions" am: 51e5e80876 am: e2919bf071

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

Change-Id: I6f59648db0f0a2eaf62bfb4b1f00fba14b2eb21b