Merge "USB Gadget v1.2: Remove redundant rndis gadget linking" am: 397a536206 am: 31e0bb7b5d am: 2d5be0dd24

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2200335

Change-Id: I32b7e988b9d6a1fec960a03a8fddff8281ec5e32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>