Merge "Emit trace sections for warmup and benchmark phases" into main am: b4e99e7d21 am: 7c2e2b5547

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

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