Merge "Sync with new drm common aidl interface" into android15-tests-dev