Merge "Adding incremental related peremissions to Shell" into rvc-dev am: d1f5bf1f93 am: 99664b235a am: bd70112ceb am: 6b669be4a6

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

Change-Id: Ida559e0a8a79f0ab24248c5b46391433a8a9b2a9