Merge "Refactor the EntitlementManager" am: 581afa0bfa am: 407c3afa4a am: 0245317764

Change-Id: I5b3093d1aa1085293bdc092cc0bdc643669d04cc
tree: cc3a66cba4c293e454b3680520826d678e9c369c
  1. Tethering/