Merge "Track camera and flashlight usage in battery stats." into mnc-dev