Merge "Add API to query KeyChain algorithm support, pt. 2" into jb-mr2-dev