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

Change-Id: I52549e142d262a3c32996d2a70b86963e1e79a37