Merge "Add unit test coverage for unlock attempts in TrustManagerServiceTest" into main