Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev