am 5c45d95b: am 1ea4a5ba: Merge "Add API to query KeyChain algorithm support" into jb-mr2-dev

* commit '5c45d95b837fc6adb7eb16816f3e2581fc527803':
  Add API to query KeyChain algorithm support