Merge changes from topic "desktop-windowing-flags" into tm-qpr-dev am: 3c6d6b52 am: 7892114f

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



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