Merge "Allow KeyMint tests to pass on devices w/out KeyMint"