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

Change-Id: Ie9a4f6005d6df55cd5d113a709470709fbe34f39