Merge "[automerger skipped] Merge "Refactor the EntitlementManager" into rvc-dev am: 1d02a79a32 am: 662d1a7994 -s ours am: 6ddd730196 -s ours" into rvc-qpr-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
8eb924661a