Merge "ITokenManager in hal manifest."
am: bd3a930386

Change-Id: I94fcbf19a61626573782269023556875c52ca97c