Merge "Fix EntitlementManager issues" am: 943af02d92

Change-Id: I557ef0b3278aa72e34a2290c49dc3c8b82bceaf9
tree: fcce61084194c3ca210396818fc5fad14ed7674a
  1. Tethering/