[automerger skipped] Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999
am: 57f7168c9e
am: ca01f2bd30
am: 783598ce7c
-s ours
am skip reason: Change-Id I7d27bc255f4f5fa8d8a34e6ced533b61ea827ef1 with SHA-1 aa87e024d5
is in history
Change-Id: Ia746e13cef0fce002901dc0f1fc6cdccb8e555aa
This commit is contained in: