Merge "Reset OTP flag before granting permission in self-revoke CTS test" into tm-dev