[automerger skipped] Merge "Update AudioService to use manifest constants for...

[automerger skipped] Merge "Update AudioService to use manifest constants for @EnforcePermission" into udc-dev am: e4e7e14c am: fdee0095 -s ours

am skip reason: Merged-In Ifd2e39b53f614c3aaf9d03413ac46fd0c6909162 with SHA-1 27e9f915 is already in history

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



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