Merge "Fix minor issues in new Javadocs of AndroidKeyStore."