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

Change-Id: Ie911f354066b05ff6eb6338e292f91535e9286d3