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

Change-Id: Iee5d340f7a878129ed8118fcf40291b7ca0040d7