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

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

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