Merge "Add drawing-order and hint to dump cmd xml output" into main am: b25ded068b am: a0ba9680a0

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

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