Merge "Bootchart updates" into main am: 1ca87c7205 am: 9824ca1bd2

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

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