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

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



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