[automerger skipped] Merge "Add JavaDerive toString to AIDL classes" am:...

[automerger skipped] Merge "Add JavaDerive toString to AIDL classes" am: 3e8c0d8b am: 0d0dc1e2 am: 225debfd -s ours am: 28855564 -s ours am: 2bb6d2aa -s ours

am skip reason: Merged-In If6d459823d3d6ceb0d7c49ba00f01268482128f6 with SHA-1 da10904e is already in history

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



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