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

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

Change-Id: Icc24b24a3f880cd8401f022bc37e0093514db1c6