Merge "Show captions on tablets even when display windowing mode is...

Merge "Show captions on tablets even when display windowing mode is fullscreen." into tm-qpr-dev am: 488a69bf

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



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