[automerger skipped] Merge "Add MODIFY_AUDIO_SETTINGS_PRIVILEGED to the...

[automerger skipped] Merge "Add MODIFY_AUDIO_SETTINGS_PRIVILEGED to the settings app" into udc-qpr-dev am: 803964ea am: da52f1b3 -s ours

am skip reason: Merged-In I4978b56091b1132f112d4ddec500710964854ec7 with SHA-1 a02ade9c is already in history

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



Change-Id: Ia7fa6d81888a90e7b2fb3e4fcb3daaa14e7290f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>