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

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

Change-Id: Ibcf3b7278802f38ff97fdcd1e8f565d7971e2527