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: c0514b47

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



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