Merge "Block cipher fixups" am: 3d98c54066

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

Change-Id: I11413c6fa509f8a93a80476d6f0e43ae8afbebc3