Merge "Add DeleteKey and DeleteAllKeys test to Keymaster VTS tests" into oc-dev
am: 0dff6286eb

Change-Id: I00514c09d2fe5b6de27b3c0597641acb831c9930