Merge "Refactor BindToDeviceSocketMutator." into udc-dev am: 50f5adc5fd

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

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