[automerger skipped] Merge "Update KM4 VTS tests to allow s/w implementation to pass." am: 1cba34ebd4 am: 097aaee88f am: 8bb8904a44 -s ours
am skip reason: Change-Id Idc5de13c342ef1ac62d3131a1a2185d5e78a0d45 with SHA-1 0a6755018f is in history

Change-Id: Ifd01b1222c48f3440694993b11fce6b7fdbce6fb