[automerger skipped] Merge "Add...

[automerger skipped] Merge "Add EncryptionOperationsTest.AesCbcZeroInputSuccess" am: 5adaa1e8 am: e3c13e64 -s ours am: 7ed6ddaa -s ours am: 017e80a0 -s ours am: 18ca379b -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: Ic4003c818d8baee842d7d7d7d487e2923e3363fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>