[automerger skipped] [automerger] Fix information disclosure in mediadrmserver DO NOT MERGE am: ecb2df5bc0 am: c88022c3de am: eea2ec03a4 am: 949bb98535 skipped: 1e3a02a61c am: 0b127b39f5 am: feeda6ddb0 am: 72b1578695  -s ours am: 38b87fea53
am: dd52ade28c  -s ours

Change-Id: I289c57a3d413016fb7babc2626a93f3096f684e9