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

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

Change-Id: I08526f43916411eda4844ed925db888cc4dbcc70