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

[automerger skipped] Merge "AudioService: validate uid / package name match" into sc-qpr1-dev am: e229a828 am: a1ae840d -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: Ib932d369dd6337af371cead9b57ec362c0db78e2