Merge "Remove invalid null check for callingPackage" into tm-dev am: e8a38ef4 am: f4babe5e

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



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