Merge "MediaPlayer subtitle data / time discontinuity interfaces" into pi-dev
am: 26ef7344c9

Change-Id: If03bf4419f12a60afd0aed8c2d1ee52774c741d3