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

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

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