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