Merge "BatteryStats: Stop reading kernel memory stats when unvailable" into oc-dev
am: 120d7b219d

Change-Id: Ib408bed1686392f6bd846071277ac29cc70d54e7