[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into...

[automerger skipped] Merge "Fix potential decrypt destPtr overflow." into rvc-dev am: 5b3fc840 am: 97a19d94 am: b443912b -s ours am: 503df7d7 -s ours

am skip reason: skip tag Change-Id Idac48307edd45fc8282902c4beeb2c8ca94f8cf3 with SHA-1 49c0fe41 is already in history

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

Change-Id: Ibed80011ea0a6633b1d2e15eb8def308b3e2f602