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

Change-Id: I4eb0f66bb3352bae0a18b70f1485c0e88199a922