[automerger skipped] Add check package belong to caller am: 1963f31a am:...

[automerger skipped] Add check package belong to caller am: 1963f31a am: 625458fa am: 7f1ec87a -s ours

am skip reason: Merged-In I93c1b4b74d8bd1e1e5202cd39038319a3f8a7f23 with SHA-1 5bfdc9f6 is already in history

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

Change-Id: I39a94b99fd616917222ad93979accc25ee4da9c3