[automerger skipped] Merge "Fix and test usb function configuration change" into sc-dev am: 424ef2043c -s ours

am skip reason: Merged-In Ia8d76a29646f36941cbb16cd68ae6887100ec8ec with SHA-1 34f7857b07 is already in history

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

Change-Id: I8a89aea4c095ca69a5c16779ac299058da3abbce