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

Change-Id: Ib0798c8a53dae5399891178cc6e33106ba9f906f