Merge "Add removeEscrowToken and remove revokeTrust() method in CarTrustAgentEnrollmentManager"