Merge "Add z-order regions for task child layers" into tm-qpr-dev am: 5d98a2db

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



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