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

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



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