[automerger skipped] Merge "AudioService: fix permission check on volume...

[automerger skipped] Merge "AudioService: fix permission check on volume control" into sc-qpr1-dev am: 50d7e14c am: 04abcfed -s ours am: 947dbfd4 -s ours

am skip reason: Merged-In I095224347b5f5c200f4a8f0dd147f63c0119dc85 with SHA-1 c9faa86b is already in history

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

Change-Id: I7a654be34a63503f8175e4da2b3818706c1fdb19