Merge "Allow more error codes on multi-padding failure" into aosp-24Q3-ts-dev