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

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

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