[automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 am: 662d1a7994 -s ours

am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 92afd387fd is in history

Change-Id: Ic218e5027de5e4751a322c96d6cce6460cf20532
tree: 44ebb4afe7b61a64f67e4fe0083c965be294a475
  1. Tethering/