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

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

Change-Id: Ida3864ef74a50d637c559155c2edc47391267857