Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165

Change-Id: I4604c7e324757e738fdaec2d2d9f0b351086a7e1
tree: 60962d57557d04e559bde4fce633400e4842d95b
  1. Tethering/