Merge "Revert "Consolidating MODIFY_AUDIO_SETTINGS permission checks"" into rvc-dev am: 601402ed82

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

Change-Id: I6a04639eabe354b546b16de309c89235ba2061bc