[automerger skipped] Make SW keymaster security level configurable am: 7f8100941a -s ours am: 66334ab08e -s ours
am skip reason: Change-Id I1b012dcd359e294dad7771c7a91e36270d9a0289 with SHA-1 c07ff34607 is in history

Change-Id: I2f84fb691154f1debbd134898f857b21d5d27f8f