Merge "Adding incremental related peremissions to Shell" into rvc-dev am: d1f5bf1f am: ee5837a4

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

Change-Id: Ibc217d426ac6de8c653c5ed9a228c44c44f0e76a