Merge "Revert "Revert "Make SW keymaster security level configurable""" into qt-qpr1-dev-plus-aosp am: d4b22e9e7c

Change-Id: Ia6404bd33013278daaa776cbb6dd546d9de4db36