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

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

Change-Id: Ia47f5557acc54572dbae5fd0dc215015884e7283