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

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