Merge "Merge "Sync with new drm common aidl interface" into android15-tests-dev am: 4421b8dd8e" into main