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

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

Change-Id: I4ffc9022639278211377e946e81978a587ff06c5