Merge "Update captions to full-width." into tm-qpr-dev am: 140cff15 am: 98fc61b9

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



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