Merge "Fix AES corrupt padding test" am: b474607b7c am: b661792d06

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

Change-Id: I2fb1239136a0defdf798881f3aaf7da524cb300a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>