[automerger skipped] Merge "Freeze Audio AIDL interfaces" am: 8182edb4 am:...

[automerger skipped] Merge "Freeze Audio AIDL interfaces" am: 8182edb4 am: 4f34d7c3 am: 63545b82 -s ours

am skip reason: Merged-In I3e7d145aa37fb67d78cf05c06da22f74c0ea07ad with SHA-1 57f771d4 is already in history

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



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