[automerger skipped] Merge "usb: Implement the AIDL in framework" am: 1a0ad60b54 am: ea87ce19b3 am: 0a87226a69 -s ours

am skip reason: Merged-In I6d9bc861a4aceb753bf6f816daccd039e423994d with SHA-1 74272e2422 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2361484

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