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

Change-Id: I216ce9065f3a5ecd26add57b7f9bad8d16fe330d