Merge "Add a flag to choose the output format for the am profile command" into...

Merge "Add a flag to choose the output format for the am profile command" into main am: 95293e07 am: 9defcb13

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



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