[automerger skipped] Merge "Make test for hardware AES support explicit." into pie-cts-dev am: 9c97eece04 am: 9810bcc608 -s ours am: 8f84717b41 am: f7c5a1e9b9 am: 79a219edf2 am: dcff38fff7 am: 3c9f1d8920

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1234967

Change-Id: I982cbf6b7ea484d18fd4f97d28e0f2cad53b7fd3