Merge "UsbSetting: The behavior is not right when enable/disable MTP/PTP with Accessory board connected."