Merge "Add bar type window caption." into tm-qpr-dev am: a5285231

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



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