Merge "Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 404c3adad7 am: 0382ca9dc1 am: c50a851e80" into rvc-qpr-dev-plus-aosp am: 552a6ecc23
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350 Change-Id: I90e56fcbc798ac2d881ace5b93ae7111e2a71552
This commit is contained in: