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

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



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