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

[automerger skipped] Merge "Remove invalid null check for callingPackage" into udc-dev am: 24e41064 am: 03e8315b -s ours

am skip reason: Merged-In I8d08eb6de72f4ac2f5ac0a5c0fef26cc0578f8e9 with SHA-1 8a7d97bd is already in history

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



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