Merge "More Javadocs for AndroidKeyStore public classes." into mnc-dev