[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: ccdda1c2 -s ours am: af780385 -s ours

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

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

Change-Id: Ie6b78a211375e3029fc3fdb6aa624b7c99020308