[automerger skipped] Merge "Add missing check in hasGrantedPolicy" into...

[automerger skipped] Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf14 am: 3900641f -s ours am: ff7e86ab -s ours

am skip reason: Merged-In I6f821d039a6dfd70fb005165af2c5cb13ad3de9b with SHA-1 251176e7 is already in history

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

Change-Id: I9102e99541d34964883b6562319822ac927c9286