Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into...
Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev am: dcca7ebd
am: ddc0123d
Change-Id: If9acf119da973d81cdca451a8f6be24fd591fdf7