Merge "Update DISALLOW_CONFIG_TETHERING javadoc"