Merge changes from topic "caption_in_wm_shell" into tm-qpr-dev am: 20f893dd

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



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