Merge "Enable transitioningToLocked_resetCallsExecuteLock and transitioningToUnlocked_resetCallsPostUnlock in presubmit" into main