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

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

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