Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev am: 9ac716fc8b am: b9af8e1af3 am: d772d1fc40 am: bceb722bec

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

Change-Id: I12e579d92fec3a0e2df07a7fd9e1122b9eca1c16