[automerger skipped] Merge "Revert "AesInvalidKeySize skip 192 on SB devices"" am: f970abe674 am: 7db2454972 -s ours am: 7418d46712 -s ours am: 5128dc79fe -s ours am: f8dfb8e520 -s ours

am skip reason: Merged-In I9f136d237bd06bfe2a1cc29d11bb1fbe0b8ace5e with SHA-1 0224cfe3e0 is already in history

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

Change-Id: I9ce4136559b64e1838aa290b2d1a73027779b87b