Merge "Revert "Consolidating MODIFY_AUDIO_SETTINGS permission checks"" into rvc-dev am: 601402ed am: 66f13a5a am: cfc820ba

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

Change-Id: Ie928b59e5c682c959c3868d15281d02c2334b3e0