Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev am: 9ac716fc8b am: 3679ed262e am: f8bcb8d6ef am: 63fd704470

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

Change-Id: I81fa6ae1639eb7c3464ebbbf2b00966cab683d12