Merge "Use task layer constants for window decor z-order" into tm-qpr-dev am: a6160ee0

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



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