Merge "Merge "GenericSource: reset timed text/subtitle after seek" into oc-dr1-dev am: 87b901caa1 am: 4af61ddad5" into oc-mr1-dev-plus-aosp
am: b51d5eef23

Change-Id: Id4e9e2faefffffb317b3f5267dcd8d261b75eeed