Add check package belong to caller am: 1963f31a52 am: 625458fadf

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

Change-Id: I812bfc842d70be80b8adc3661d93cfab8ce30fae