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

Change-Id: I8f6acb40a4aa6946c704fa9043578a40b777772d