Fix vulnerability in drmserver Bug: 379695596 Flag: EXEMPT CVE_FIX Test: atest StsHostTestCases:android.security.sts.Bug_379695596 Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:358b3457706b53f63ea10e9905e953e2c9c37f31 Cherrypick-From: https://googleplex-android-review.googlesource.com/q/commit:5dd95d00af9a58840fd842b75fc0876dc356d917 Merged-In: I6efecac362757c10b2308d020440eac5edc5b873 Change-Id: I6efecac362757c10b2308d020440eac5edc5b873