Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: faf2d5524b am: be689dc9fa am: d7ddac0e79

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

Change-Id: I53318fdc3d116127dd9d22bb449b8868313a38ba