Merge "Skip updating flags for a permission that's not requested." into rvc-dev am: 97110707 am: 99856e9f am: b98c2e02 am: 3424c820

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

Change-Id: I234264185cf8e53167dd871e606d1598c0c4c27b