Merge "Add full-width caption on Shell." into tm-qpr-dev am: 12fb8ad349

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

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