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

Change-Id: I10fa28da314ccb29d95fd5beee09d372b1e614d1