Merge "MediaRecorder: Handle 24-hour timelapse duration" into oc-dev
am: 6847989333

Change-Id: I0e1c97bbbd1d1606424bdff5c3f57e1802693a4b