[automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 -s ours
am skip reason: Change-Id Ic83f42ff4eec38adf039d55d80fcb9b0f16373cc with SHA-1 33d861e6a7 is in history
Change-Id: Iabc445c8067b64cf4c9c10e781e922b8f58d0227
This commit is contained in: