Merge "Fix potential heap data leak in mediadrmserver" into nyc-mr1-dev
am: 824d20c999

Change-Id: I19f48890ed389b1676419e62660e66b5cae1084d