Revert^2 "Continue to remove code around legacy captions"

This reverts commit 35ed169b.

Reason for revert: This CL is good. The failing test in b/343271861 needs to be fixed.

Bug: 343271861
Bug: 333724879
Test: Presubmit tests.
Change-Id: I4d9726da9bb3cc8c3c833555ac625a67dd09380d