[automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 am: f4ba82a587 am: 53ee61ff48 am: 8ed40cc267 -s ours am: 80b423ee36 -s ours

am skip reason: Change-Id Id0cb59cc4681f5ffbde7be54de05a05e46f0ffb8 with SHA-1 bd8d7a8208 is in history

Change-Id: I0a5d49331d938aa2b9f5f95f5b71c1dfcf98b797
tree: a3eee5f73633c6f65e147b28155789b4b133c72e
  1. Tethering/