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

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

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