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: I6d4d9d622a409de882275c3cf6318b6961b89e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>