Merge "[Tether04] Migrate EntitlementManager into module"
am: 47db7adcca

Change-Id: I661a6e77caf100016757ffb95cd2cbdc57243ffb