Update comments and bump batterystats version to 30.

Bug: 70808931
Bug: 31866283
Test: build Android
Change-Id: I8238c3135e79442ede97b87933dab85d8ff71134
2 files changed