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

Change-Id: Ice5d228159265a6226cee2f29ef28e660e01f5a8