[automerger skipped] Merge "Remove invalid null check for callingPackage" into...

[automerger skipped] Merge "Remove invalid null check for callingPackage" into tm-dev am: e8a38ef4 am: e600cce4 -s ours am: 2b712d8e -s ours am: 8fb4b4e6 -s ours am: 0819657b -s ours

am skip reason: Merged-In I86c8f2e9bccb9a0f8ee7ec29bd3e79dbfa05e9da with SHA-1 9c1bdd63 is already in history

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



Change-Id: I5e64ebad386257cf70aa29f20f1c736db31855ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>