Merge "Refactor the EntitlementManager" am: 581afa0bfa

Change-Id: I20f7b03356592cd184b695e4ceb491d4b04cde14
tree: f243114f429ccdfea2e3e78feb60c1ce0d203b3d
  1. Tethering/