Merge "Do not update time offset for time lapse recording after pause" am: a864ea5f2d
am: 05948baa04

Change-Id: I38f29db5e54427f9e0a8873473c56dc14cd458a6