Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e am: dfae0aad am: ba2627dd am: 9ecf791f

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

Change-Id: I808eb799788015c11dade69ca62cbd1defddb2d6