Merge "Keep wallpaper on top when finish a non-fullscreen unoccluding window"...

Merge "Keep wallpaper on top when finish a non-fullscreen unoccluding window" into tm-dev am: 3b3491b9 am: 5f4a6cde

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



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