Merge "Block cipher fixups" am: 3d98c54066 am: 1bdbe9528d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1949538

Change-Id: I03c7915f3f5f03a824a4c16c83bcc77a0fd1114b