Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev am: dcca7ebd8b
am: fc32901189

Change-Id: I7687022e048283ce20e940963896af32c1315143