[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: 4fe3aea6 -s ours am: 75d1d1be -s ours am: 3b6e7cbe -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: I69962289c1ee8a71ef6d3b37d0c7a2988e6171ee