Merge "BatteryStats: Add debug logging to narrow down slow camera launch" into oc-dev
am: 7a0fef9324

Change-Id: I7d3e61fc5c228d5590929acf63a747c7ccf4a4b5