[automerger skipped] Merge "Support caption second UI structure (5/n)" into...
[automerger skipped] Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d9 am: 57f7168c am: 017a59b9 am: 014350da -s ours
am skip reason: Change-Id I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1 with SHA-1 ba7eb478 is in history
Change-Id: I904ab58137240ab63224b90355d1f5355cfb0583