Merge "Fix: stop rounding off perf times at the second boundary" am: dee059a099 am: 530a4b8f6d

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1813056

Change-Id: I61d8120bc887032393cae4c3837069e06efab327