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

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

Change-Id: I846d4312d831086e7d12d5a845aa3cb7e346afd8
tree: 375b7a805e75226301a720007d14fa412a2e5d42
  1. Tethering/