Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into...
Merge "Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev am: 26ef7344" into pi-dev-plus-aosp
am: 77fca220
Change-Id: Icc7994f8625023f2f5c9c76081e17b9d6d166f19