[automerger skipped] Merge "AudioService: validate uid / package name match"...

[automerger skipped] Merge "AudioService: validate uid / package name match" into sc-qpr1-dev am: e229a828 -s ours am: 926ceb23 -s ours am: e4b29f82 -s ours

am skip reason: Merged-In Ice7a84993c68e7ec736fdf0b9fd5b8171b37b725 with SHA-1 e0141e5b is already in history

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

Change-Id: If7655dfc0f96cf8323b3b2f80eb9184975d894b1