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

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

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