[conflict] Merge "Enable WM remote occlude flag; fix occlude state issues."...

[conflict] Merge "Enable WM remote occlude flag; fix occlude state issues." into tm-dev am: ef4ec2ff am: ab968cd4

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



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