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

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



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