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

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

Change-Id: Idd9010fc9a1fc69510985647f06dbe9fdfbf45be