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

Change-Id: Iaf2580d742329db0280d8d466bb40482419099fd