Merge "Fix limited use key keymint vts test when using pure software keymaster context to pretend some sort of hardwares." am: e33695fc5c am: e3b17cbda3

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1583303

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3e96b112e1f473c91d5ef34a91062cc723848d69