Merge "Reapply aosp/970247 to fix SubInfo#toString." into rvc-dev