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

Change-Id: I6ef1beaa0ccae2312260164cc9687105f06810af