Merge "Fix PermissionHelper NullPointerException" am: f8c768eef1 am: 58a5a80d8c

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

Change-Id: I63eb4a0e99c49f88668f1d58ab697ba3c000cb4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>