Merge "clearkey hidl: fix oob read in decrypt" into qt-dev am: a0ec467e am:...

Merge "clearkey hidl: fix oob read in decrypt" into qt-dev am: a0ec467e am: f4e93175 am: 498c4ed2 am: f1f6d941 am: b3bef4b5

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

Change-Id: I3fb502a4a5ffa22e5b4b91f6877935a239ba083a