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

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

Change-Id: Icdc2e9ad3add95ad2dd46e394a57cf641a088653
tree: 3332cdf43d290cc519cb963b3006aa00b43c29fd
  1. Tethering/