[automerger skipped] Enable and disable usb IpServer according to ACTION_USB_STATE am: 0450443f37 -s ours am: 1874d956e1 -s ours

am skip reason: Merged-In I8375e3f998d677dc658370b2553facaec0d5ff7c with SHA-1 b41a00e778 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/15211231

Change-Id: Ibcb7adc5bec8e772613b83562681d5397bd315c4