Merge "Adding incremental related peremissions to Shell" into rvc-dev am: d1f5bf1f am: 99664b23 am: 087cc2f0

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

Change-Id: Ia64f51def385428658d89e362c0764e10c6c36d6