Merge "Hide windowing controls in proto1 caption menu" into udc-dev am: 196e62a8 am: 545a1195

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



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