Merge "Removing extraneous field from batterystats dumpsys." into nyc-dev