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

Change-Id: I7bb6b403f9c00b879dba9e3826f61369bbe4f78e