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

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



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