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

Change-Id: I5b74913b0d90ed40651f8e2d276bfb4f80e0d4ce