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: Ideae12624e34aa55a378dacc53c69c44e219199c