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