Merge "Add Keymaster VTS tests for some AES cases:"
am: 772fb53999

Change-Id: I6ad8fc6a90a29a59a6f927ed0160565e6be671c1