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

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

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



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