[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am: ecb2df5bc0

Change-Id: Iba22b0efec9ee75ee535c10a0415b4a1e70adfb0