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

Change-Id: I1b459a5507a259d12ee1bb7c8a94870554bc1ca4