Merge "Remove deprecated entitlement API"
am: 9d9850ae30

Change-Id: I6b19b684a1dfa509ee77304d6acfe3fcdb6ca69c
tree: d61d36fc527fa8dad23f0f1d977208415faf12a0
  1. core/
  2. services/
  3. tests/