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

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