Merge "Grant shell missing permissions" am: 51e5e80876

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

Change-Id: I7da950a176408ded482230d21df0fc772192de3a