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

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

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