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

Change-Id: Iab7d9de93dadb13a56d204771a4b740a64779397