Merge "Fix AES corrupt padding test" am: b474607b7c am: b661792d06 am: 2e449950d6 am: 2c19304e56 am: ebc815a798

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

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