[automerger skipped] Merge "Add check to verify package belongs to caller"...

[automerger skipped] Merge "Add check to verify package belongs to caller" into sc-qpr1-dev am: 4dd98007 am: 25b202f2 am: eba22091 -s ours

am skip reason: Merged-In I343b847ae3e070201a7ac93ad88ceb2e47e829b2 with SHA-1 fd5b4bcb is already in history

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

Change-Id: I82f00588f5c2a3dbed3b26b7773e94ef966a0fe4