Merge "Show window captions only on standard activities" into tm-qpr-dev am: b3fe3948

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



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