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

[automerger skipped] Merge "Merge "Revert "Sync with new drm common aidl interface"" into android15-tests-dev am: 4b93de7e" into main am: 3bf74ea9 am: 82d91605 -s ours

am skip reason: Merged-In I54b1ebbb1e9e3467ecb401555c4de42dfcaf8ca6 with SHA-1 2e55e1f2 is already in history. Merged-In was found from reverted change.

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

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



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