Merge "Fix and test usb function configuration change" into sc-dev am: 424ef2043c

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

Change-Id: I4715b27d4ce6f44411703ede576b20811328f113