Merge "Change setDiscontinuity API" am: a878e9d6f4 am: 1b1799fbad am: d554114b50

Original change: https://android-review.googlesource.com/c/platform/system/media/+/1597994

Change-Id: Id7c3ef08af5a533f5216ce7ecd68b7d7f365839d