[automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am:...
[automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 4df5657a -s ours am: 927995db -s ours
am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 981b2763 is in history
Change-Id: Ic115e06c61f0aa044f8092e38c360056583b5943