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

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

Change-Id: I4d52ea1abc8adbda85643e13fd2597f33c0a00ef