Merge "Fix NPE in `dumpsys batterystats` when `streamlined_battery_stats` is disabled" into main