[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: 89456ad1 -s ours
am skip reason: Change-Id I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1 with SHA-1 aa87e024 is in history
Change-Id: Ifb0454237da0c0f892cc171855a197da7a622624