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

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

Change-Id: Ic22410e095045d2ca71a78203eca9feabc85e1b5
tree: a518310cfc6bcf99ea9569a5f45126fe4586fc3e
  1. Tethering/