Merge "Fix information disclosure in mediadrmserver" into oc-dev am: f452267ae8 am: dd57ac5b26 am: f19106c7cc am: 22fca9cd62
am: 973c041e7e

Change-Id: Idfb74dcb06cf97f9b65d98108218f80df1bace30