Revert "Continue to remove code around legacy captions"

This reverts commit 8947d4948abe98cffafb09c2500d014bd4cb031f.

Reason for revert: Droidmonitor created revert for b/343271861. Will be verifying through ABTD before submission.

Change-Id: I54768ea2d2acbd72e633428cf8679ec533521be0
17 files changed