Merge "Fix crash in RequiresPermissionChecker.java" am: ede4a8a9d4 am: 484c089212 am: 6a088277f4

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

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