Merge "Improve caption layout" into tm-qpr-dev am: 1de186f8 am: 670c456e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20199776



Change-Id: Ifaad77b209f0bfb5649691a2605d2e773f061318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>