Merge "Merge "Revert "Sync with new drm common aidl interface"" into...

Merge "Merge "Revert "Sync with new drm common aidl interface"" into android15-tests-dev am: 4b93de7e" into main am: 3bf74ea9

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



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