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

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

Change-Id: Idd431d294b85784a34852f463394c9cb8e2a17a4