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

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

Change-Id: Ie14e92a190d0b8a292a83035ee21571e69914627