[automerger skipped] Merge "Add...

[automerger skipped] Merge "Add EncryptionOperationsTest.AesCbcZeroInputSuccess" am: 5adaa1e8 am: e3c13e64 -s ours

am skip reason: Merged-In I729c2bad65e9d8b194422032346e5ee3c4b0dce5 with SHA-1 e6f9ff6c is already in history

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



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