[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am: ecb2df5bc0 am: c88022c3de am: eea2ec03a4 am: 949bb98535 skipped: 1e3a02a61c
am: 0b127b39f5

Change-Id: Iffead21fcb5bd624ee95160faec39eb02ad8d981