Merge changes from topic "USB AIDL Migration" am: ef0ed10e8f am: 71fcb7e605

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

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