Merge "Revert "Consolidating MODIFY_AUDIO_SETTINGS permission checks"" into rvc-dev am: 601402ed am: bb31d501 am: 7a8ddb26

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

Change-Id: Iabf81733a15fe8ed86b7add69ad1718c124d34e6