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

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

Change-Id: I958250d37114932d7db384bf77fc3a4e742a2e1d