Merge "Bootchart updates" into main am: 1ca87c7205

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3534400

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