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

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

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