Merge "Fix and test usb function configuration change" am: 840e2efd7f am: 717c8ff590

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

Change-Id: Iac2ab9a589c878bee92179956df7802ea51c7a3e