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

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

Change-Id: I53a8babf0206f69051c6a655b08ad6a770197923