[automerger skipped] Merge "New Pipeline: log structure in dumpsys" into...

[automerger skipped] Merge "New Pipeline: log structure in dumpsys" into tm-qpr-dev am: 050e37ec am: d5c5b3a1 -s ours

am skip reason: Merged-In I774c444deae8a215921a80946d1d82cf2ad128bf with SHA-1 ef94fc2f is already in history

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



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