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

Change-Id: I0d11825de0cef6632c86f9087a0d8797f4d7a28e
tree: 69b06a33c4ae0ef2b6848cd543d303551ddf14ba
  1. Tethering/