[automerger skipped] Merge changes from topic "c2aidl" am: 94a68d04 am:...

[automerger skipped] Merge changes from topic "c2aidl" am: 94a68d04 am: 267986bd am: a6bedfe5 -s ours

am skip reason: Merged-In I1fc28084519281df68bca7ae5e2b814b03214577 with SHA-1 45b06598 is already in history

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



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