[automerger skipped] Merge "Remove invalid null check for callingPackage" into tm-dev am: e8a38ef4c0 am: f4babe5eb8 am: 1d22246cf8 -s ours am: 896b08fea7 -s ours am: 0e810b1d21 -s ours

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

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

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