[automerger skipped] Merge "AesInvalidKeySize skip 192 on SB devices" into...

[automerger skipped] Merge "AesInvalidKeySize skip 192 on SB devices" into stage-aosp-sc-ts-dev am: 89ec9c60 -s ours am: e8e81892 -s ours am: c63a5d0e -s ours am: cdd7f825 -s ours am: 2e450624 -s ours

am skip reason: Merged-In Ic0ff19d2d19d6e18dfbc0fad4b8182264f36b2f6 with SHA-1 5b7f78d4 is already in history

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

Change-Id: I8fabad47ab7fcc3b8e03bfb2aaba5e18887e7e59