Merge "Remove deprecated entitlement API"
am: 36459170a7

Change-Id: I6b19b684a1dfa509ee77304d6acfe3fcdb6ca69c