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: fc329011
am: 3c5628cf
Change-Id: Id74b4cd08b495070cacbf9b1d98239c075a4ec4e