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

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

Change-Id: I63ea85d30b1d0070381ff7de1e4d78f6dfd1fa08