[automerger skipped] clearkey hidl: parsePssh securely am: 69279d95 -s ours...

[automerger skipped] clearkey hidl: parsePssh securely am: 69279d95 -s ours am: 6d5a5c10 -s ours am: b484a03d -s ours am: 106e203a -s ours

am skip reason: Change-Id I480ee99778f8c774cb5b857b25c32d926270092d with SHA-1 69279d95 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11712803

Change-Id: Ic2c753807fab70db569d93eab6fc44d1f3e95b39