Merge "Merge "Revert "media: Increase the maximum ctts offset to be 2...
Merge "Merge "Revert "media: Increase the maximum ctts offset to be 2 seconds."" into oc-dr1-dev am: dcca7ebd am: ddc0123d" into oc-mr1-dev-plus-aosp
am: 34526d6a
Change-Id: I213ac610ae8fadc01157b4708652b8b006613e4d