Merge "Change BKS KeyStore to use default provider for crypto." am: b3e454f321
am: fa92700572

Change-Id: Ide2e447a17a5614e53c756221992b8a73958922f