Merge "Add missing check in hasGrantedPolicy" into sc-qpr1-dev am: 0beddf145a

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

Change-Id: I5acfe3c0df1b6b7aaa75cfdf3c3b3df110041444