Merge "Add BlockMode.GCM constant to AndroidKeyStore API."