Merge "[Settings] Pass lock type extra back to SUW" into mnc-dev