[automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 -s ours am: c2de7d994d -s ours am: 5e6c9a8f45 -s ours

am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 33d861e6a7 is in history

Change-Id: Ib1926e1a0f1a2d5d6a056440fa647e1cf6ee6f8d
tree: 41b0ba53be471ca9500ed242967fc38f873e6c06
  1. Tethering/