Merge "Fix StringDef usage in MediaDrm API" into oc-dev
am: d2b1f3812c

Change-Id: Ide47e76bd45fe1f50588b4d2fc3f124196ec9769