Merge "Fix crash in RequiresPermissionChecker.java" into tm-qpr-dev am: 4daa2f13 am: c1bd8dba

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



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