Merge "BatteryStatsManager: Address API council feedback" into rvc-dev am: 03a65f1a am: f0d757ac am: eb05d361 Change-Id: I4a6aca5d9b0bc4494985a9e23c2b2d332565d053