Merge "Add API to query KeyChain algorithm support" into jb-mr2-dev