Merge "Fix crash in RequiresPermissionChecker.java" am: ede4a8a9d4

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

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