Merge "Fix drm aidl listeners"