[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: ca01f2bd am: 783598ce -s ours am: b50db265 -s ours

am skip reason: Change-Id I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1 with SHA-1 aa87e024 is in history

Change-Id: I7864f0c94422785467ddd3d6aa491360b165139b