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

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

Change-Id: Ibbb671d0e0e677d1b373f80dc0c3216ba9d67f1f