Merge "Minor style cleanup for Shell caption classes." into tm-qpr-dev am: 1c58bf55

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



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