Merge changes from topic 'am-a47d2b51b72a4b9da02be5683a2ecaae'

* changes:
  Merge "Track Partial wakelock time in background" into oc-dev am: 1dfd194f7d am: b5ba4b1fd2
  Merge "Fix batterystat Counter misreporting when charging" into oc-dev am: 413b135244 am: 95d00a9a25
  Merge "Batterystats track background bad ble scan time" into oc-dev am: fe06de1fc2 am: 41e3f1479c