am 7e5bb370: Merge "Track camera and flashlight usage in battery stats." into mnc-dev

* commit '7e5bb3701a313e539447c96ee2b31df62edc79fe':
  Track camera and flashlight usage in battery stats.