Merge "Revert "Pass entitlement configuration to Settings for entitlement check"" into rvc-dev am: f1b2407490 am: ed00400645 am: 15b3733d62 am: f1d115a717

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

Change-Id: I808eb799788015c11dade69ca62cbd1defddb2d6
tree: 0a113a62c525913293638f3749c391f614dcf26f
  1. Tethering/