[automerger skipped] Merge "Fix EntitlementManager issues" into rvc-dev am: aaf92e5165 am: f4ba82a587 -s ours

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

Change-Id: Ib396af9574b8ae6a07297a9a171f5da7bdac3ada
tree: 394ac0348cc87b2a4ea310ab06a47387e3a268d7
  1. Tethering/