[automerger skipped] Merge "clearkey hidl: fix oob read in decrypt" into...

[automerger skipped] Merge "clearkey hidl: fix oob read in decrypt" into pi-dev am: f1307ef2 -s ours am: 53f1ece5 -s ours am: 930d2d7f -s ours am: 77bec6bc -s ours am: b7f922f0 -s ours

am skip reason: Change-Id I27b05479202e0caedfd052c683aa1ef187f65679 with SHA-1 9adaa6b8 is in history

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

Change-Id: I2d9cdc50b005b3450cbdde4845550576e1d8097b