Merge "clearkey hidl: fix oob read in decrypt" into qt-dev am: a0ec467ed3 am: f4e931750a am: 498c4ed2fa

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

Change-Id: I76e668967bab06f713f77dda3c0d52142cd0f3be