Merge "Update javadoc for DISALLOW_SYSTEM_ERROR_DIALOGS"