Fix enforcement of block mode and MAC length on AES ops

Cherry-picked from internal.

Bug: 22301168
Change-Id: I54b4efffa1786b08704dd6e785360870f155ed80
2 files changed