Merge "Make fewer assumptions in AndroidKeyStoreTest." into mnc-dev