Merge "Fix monotonic clock and deadlock in `dumpsys batterystats`" into main