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

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

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