[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am:...
[automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am: ecb2df5b am: c88022c3 am: eea2ec03 am: 949bb985
Change-Id: I52549e142d262a3c32996d2a70b86963e1e79a37