[automerger skipped] Merge "[Tether04] Migrate EntitlementManager into module" am: 47db7adcca am: bc5353c16c
am:5243565849-s ours am skip reason: change_id Ifdfc6cd95377351c37946a146b60896f07ece59d with SHA167fac18ad9is in history Change-Id: I5ecd147b860ea84bda21c6a58da4955cb987907d
This commit is contained in: