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

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

Change-Id: Ibdc5483f00a8554db0c00e9163b527e6f3973b85