Merge changes from topic "bscamera3"

* changes:
  Add per-UID measured camera stats
  Add measured camera stats to BatteryUsageStats
  Collect camera power consumption into BatteryStats