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

[automerger skipped] Merge "AudioService: validate uid / package name match" into sc-v2-dev am: e842065d am: 24c5b80e -s ours

am skip reason: Merged-In I5cdd52899bc3c89b41bc6074568e2b62637c005c with SHA-1 33ef9474 is already in history

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

Change-Id: I7dddd74dcf6213d8bb22551de3aa7ef4daaaf24c