Merge "[automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 am: 662d1a7994 -s ours am: 6ddd730196 -s ours" into rvc-qpr-dev-plus-aosp am: 8eb924661a -s ours

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

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