Merge changes from topic "desktop-windowing-hide" into tm-qpr-dev am: 4c8cb702 am: 04898b69

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



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