[automerger skipped] Merge "[DO NOT MERGE] Verify package name and UID for...

[automerger skipped] Merge "[DO NOT MERGE] Verify package name and UID for trusted app check" into sc-v2-dev am: 38d4f8e7 am: 80a4a380 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Iec1012f04be21399d630f855690589748278e93f