Merge "Replace "TEE" with "secure hardware"." into mnc-dev