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: I74f5c136847baa51dc86c28f72eb9f213b8a273f