[automerger skipped] Merge "Merge "Sync with new drm common aidl interface"...

[automerger skipped] Merge "Merge "Sync with new drm common aidl interface" into android15-tests-dev am: 4421b8dd" into main am: 30ce127f am: 2daac9b4 -s ours

am skip reason: Merged-In I54b1ebbb1e9e3467ecb401555c4de42dfcaf8ca6 with SHA-1 2e55e1f2 is already in history

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



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