Merge "Add OnMediaTimeDiscontinuity notification" into pi-dev
am: ef3dbdbf73

Change-Id: Id32a1f6ed115d3d62bc53e4048963b59cef6f875