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

Change-Id: If0f1393a3a4dae5888236323d65c4e8c79c4c2c0