Merge "MediaPlayer/ModularDrm API review: Document/runtime exception update" into oc-dev