Merge "Fixed the logic for tethering provisioning re-evaluation" into security-aosp-mnc-mr1-release