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

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



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