Merge "Add Android KeyStore API demo" into jb-mr2-dev