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

[automerger skipped] Add check package belong to caller am: 1963f31a am: 62a0e332 -s ours am: 3f70df42 -s ours

am skip reason: Merged-In I93c1b4b74d8bd1e1e5202cd39038319a3f8a7f23 with SHA-1 1963f31a is already in history

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

Change-Id: I74af197286b2bf64aafa0d4fd9b98d781ee12b8b