[automerger skipped] Merge changes from topic "c2aidl-hidl-token" into main...

[automerger skipped] Merge changes from topic "c2aidl-hidl-token" into main am: 7b0acc5b am: 0bddb068 -s ours

am skip reason: Merged-In I035874efebe2ed6e11a418e8570671c41fead14f with SHA-1 f0f62761 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3009983



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