Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: 322c525e6b am: dfae0aad30 am: ba2627dd61

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

Change-Id: Ic22410e095045d2ca71a78203eca9feabc85e1b5