Revert "Revert "Make SW keymaster security level configurable""

This reverts commit b0b90f64bd5ab2fcf590d61cfe856b7aff60b437.

Reason for revert: Will apply fixes in topic.

Change-Id: I10515d77310b4d2fd2922e1083df19269f199f33
4 files changed