Merge "Make sure the requested windowing mode is set to the container" into udc-dev am: e1671c02

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



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