Merge "Fix NPE in `dumpsys batterystats`" into main