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

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

Change-Id: I297f1b3a562df834c4021cdf5bfd395fa49cbc5a