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

Change-Id: Iaa6232308cbca7ebb61d43c76df9e15e6ef19b1c