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

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

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