[automerger skipped] Merge "clearkey hidl: fix oob read in decrypt" into pi-dev am: f1307ef283 -s ours am: 53f1ece56c -s ours am: 930d2d7f78 -s ours am: 77bec6bc61 -s ours am: 3778ba122f -s ours am: 019171e38c -s ours am: c52f7cdcf5 -s ours

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

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

Change-Id: I121b2ec751d23119034ac6fdaf5d253c0d29e9c3